From 7ac5bb877b373ae61d09a4496b80f3db2952c79c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian.jackson@citrix.com>
Date: Fri, 21 Sep 2018 16:14:49 +0100
Subject: [PATCH] turn off debug

---
 debian/rules       | 38 ++++++++++++++++++++++----------------
 debian/xen-kconfig |  1 +
 2 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 debian/xen-kconfig

diff --git a/debian/rules b/debian/rules
index 5d19fe5999..866329fa93 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,6 +33,22 @@ dpkg_CFLAGS   := $(shell dpkg-buildflags --get CFLAGS)
 dpkg_CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
 dpkg_LDFLAGS  := $(shell dpkg-buildflags --get LDLAGS)
 
+include /usr/share/dpkg/architecture.mk
+
+make_args_common= \
+	XEN_COMPILE_ARCH=$(XEN_ARCH_$(DEB_BUILD_ARCH)) \
+	XEN_TARGET_ARCH=$(XEN_ARCH_$(DEB_BUILD_ARCH)) \
+
+# fixme ^ "you must use make menuconfig"
+
+make_args_xen= $(make_args_common) \
+
+make_args_tools= $(make_args_common) \
+	EXTRA_CFLAGS_XEN_TOOLS='$(dpkg_CFLAGS) $(dpkg_CPPFLAGS)' \
+	PREPEND_LDFLAGS_XEN_TOOLS='$(dpkg_LDFLAGS)'
+	OCAMLDESTDIR=$(CURDIR)/$(BUILD_DIR)/install-utils_$(ARCH)/$(OCAML_STDLIB_DIR) \
+	PYTHON=$(shell pyversions -r)
+
 %:
 	dh $@
 
@@ -41,7 +57,12 @@ override_dh_auto_clean:
 
 override_dh_auto_configure:
 	dh_update_autotools_config
-	./configure \
+	:
+	cp debian/xen-kconfig xen/.config
+	make -C xen olddefconfig $(make_args_xen)
+	false
+	:
+	$(make_args_tools) ./configure \
 		--disable-stubdom \
 		--prefix=/usr \
 		--includedir=/ousr/include \
@@ -59,21 +80,6 @@ override_dh_auto_configure:
 		--enable-ovmf --with-system-ovmf=/usr/share/ovmf/OVMF.fd \
 		--with-system-seabios=/usr/share/seabios/bios-256k.bin
 
-make_args_common= \
-	debug=n
-	XEN_COMPILE_ARCH=$(XEN_ARCH_$(DEB_BUILD_ARCH)) \
-	XEN_TARGET_ARCH=$(XEN_ARCH_$(DEB_BUILD_ARCH)) \
-
-# fixme ^ "you must use make menuconfig"
-
-make_args_xen= $(make_args_common) \
-
-make_args_tools= $(make_args_common) \
-	EXTRA_CFLAGS_XEN_TOOLS='$(dpkg_CFLAGS) $(dpkg_CPPFLAGS)' \
-	PREPEND_LDFLAGS_XEN_TOOLS='$(dpkg_LDFLAGS)'
-	OCAMLDESTDIR=$(CURDIR)/$(BUILD_DIR)/install-utils_$(ARCH)/$(OCAML_STDLIB_DIR) \
-	PYTHON=$(shell pyversions -r)
-
 override_dh_auto_build:
 	$(MAKE) $(make_args_xen) xen
 	$(MAKE) $(make_args_tools) tools docs
diff --git a/debian/xen-kconfig b/debian/xen-kconfig
new file mode 100644
index 0000000000..0f3b6a4332
--- /dev/null
+++ b/debian/xen-kconfig
@@ -0,0 +1 @@
+CONFIG_DEBUG=n
-- 
2.30.2